From 776ce3ec760b0fbb271f1063de6290537231c9dd Mon Sep 17 00:00:00 2001 From: "djm@kirby.fc.hp.com" Date: Sat, 8 Oct 2005 14:28:56 -0600 Subject: [PATCH] Update ia64 to keep up with core changes --- linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre | 2 +- linux-2.6-xen-sparse/arch/ia64/xen/drivers/evtchn_ia64.c | 8 +++++++- .../include/asm-xen/asm-ia64/hypervisor.h | 1 + xen/arch/ia64/xen/hypercall.c | 1 + xen/arch/ia64/xen/xenmisc.c | 1 + 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre b/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre index d79b868448..2c81709555 100755 --- a/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre +++ b/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre @@ -17,7 +17,7 @@ then mv arch/xen arch/xen.xen-x86 mkdir arch/xen mv arch/xen.xen-x86/configs arch/xen - mv include/asm-generic include/asm-generic.xen-x86 +# mv include/asm-generic include/asm-generic.xen-x86 mv include/linux include/linux.xen-x86 mkdir include/linux fi diff --git a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/evtchn_ia64.c b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/evtchn_ia64.c index 9f64f0ce4e..b5942442e8 100644 --- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/evtchn_ia64.c +++ b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/evtchn_ia64.c @@ -35,12 +35,18 @@ int bind_virq_to_irq(int virq) while(1); } +void notify_remote_via_irq(int virq) +{ + printk("notify_remote_via_irq called... FIXME??\n"); + while(1); +} + void unbind_virq_from_evtchn(int virq) { evtchn_op_t op; op.cmd = EVTCHNOP_close; - op.u.close.dom = DOMID_SELF; +// op.u.close.dom = DOMID_SELF; op.u.close.port = virq_to_evtchn[virq]; if ( HYPERVISOR_event_channel_op(&op) != 0 ) BUG(); diff --git a/linux-2.6-xen-sparse/include/asm-xen/asm-ia64/hypervisor.h b/linux-2.6-xen-sparse/include/asm-xen/asm-ia64/hypervisor.h index ac2ae71c54..6890c67d7d 100644 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-ia64/hypervisor.h +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-ia64/hypervisor.h @@ -48,6 +48,7 @@ void force_evtchn_callback(void); // for drivers/xen/privcmd/privcmd.c #define direct_remap_pfn_range(a,b,c,d,e,f) remap_pfn_range(a,b,c,d,e) #define pfn_to_mfn(x) (x) +#define mfn_to_pfn(x) (x) #define machine_to_phys_mapping 0 #endif /* __HYPERVISOR_H__ */ diff --git a/xen/arch/ia64/xen/hypercall.c b/xen/arch/ia64/xen/hypercall.c index c8abf6d115..111219e97b 100644 --- a/xen/arch/ia64/xen/hypercall.c +++ b/xen/arch/ia64/xen/hypercall.c @@ -15,6 +15,7 @@ #include #include #include +#include extern unsigned long translate_domain_mpaddr(unsigned long); extern struct ia64_pal_retval xen_pal_emulator(UINT64,UINT64,UINT64,UINT64); diff --git a/xen/arch/ia64/xen/xenmisc.c b/xen/arch/ia64/xen/xenmisc.c index 49a44e0001..e25a8fa1f0 100644 --- a/xen/arch/ia64/xen/xenmisc.c +++ b/xen/arch/ia64/xen/xenmisc.c @@ -16,6 +16,7 @@ #include #include #include +#include efi_memory_desc_t ia64_efi_io_md; EXPORT_SYMBOL(ia64_efi_io_md); -- 2.30.2